-alias alisonwang Alison Wang <alison.wang@freescale.com>
+alias alisonwang Alison Wang <alison.wang@nxp.com>
# Architecture aliases
-alias arch arc, arm, bfin, m68k, microblaze, mips, nds32, nios2, powerpc, sandbox, superh, sparc, x86
+alias arch arc, arm, m68k, microblaze, mips, nds32, nios2, powerpc, sandbox, superh, x86
alias arches arch
alias arc uboot, abrodkin
-alias arm uboot, aaribaud
+alias arm uboot, aaribaud, trini
alias at91 uboot, abiessmann
alias davinci ti
alias imx uboot, sbabic
alias zynq uboot, monstr
-alias bfin uboot, vapier, sonic
-alias blackfin bfin
-
alias m68k uboot, alisonwang, angelo_ts
alias coldfire m68k
alias nios2 nios
-alias powerpc uboot, afleming, kimphill, galak, stroese, wd
+alias powerpc uboot, afleming, stroese, wd, yorksun, mariosix
alias ppc powerpc
-alias mpc5xxx uboot, wd
-alias mpc8xx uboot, wd
-alias mpc82xx uboot, wd
-alias mpc83xx uboot, kimphill
-alias mpc85xx uboot, afleming, galak
-alias mpc86xx uboot, afleming, galak
-alias ppc4xx uboot, stroese
+alias mpc83xx uboot, yorksun, mariosix
+alias mpc85xx uboot, afleming, yorksun
+alias mpc86xx uboot, afleming, yorksun
alias sandbox sjg
alias sb sandbox
-
-alias superh uboot, iwamatsu
+alias superh uboot, iwamatsu, marex
alias sh superh
alias x86 uboot, sjg, bmeng